Merge branch 'master' into allow-examples-to-be-library
authorAlexey <kalita.alexey@outlook.com>
Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
committerGitHub <noreply@github.com>
Fri, 20 Jan 2017 17:27:25 +0000 (21:27 +0400)
commite73e2706e48df64f07f01fb6b7a14f5687649e77
treef775d885821afd67c7eed48b491834162404c961
parent865e0e55eb6146d89e659727ecc9c08606154aeb
parent1eb600d59c405dcfbe5c12bb00f9fd4baa333ea6
Merge branch 'master' into allow-examples-to-be-library
src/cargo/core/manifest.rs
src/cargo/util/toml.rs